Undo attempt at supporting "long" and "double" on ARM