Back out float changes for now.