Reverting stray commit part II, r8156 had the base64 export patch mixed with the...