Unify 32 and 64 again

Signed-off-by: Alec Ari <neotheuser@ymail.com>