Revert "Commit before taking out floors."

This reverts commit dcdc8bf43f4a186134dd451a1b910016e00037af.