Temporary revert and test removal - pending float/double cleanups