Revert "Revert "Commit before taking out floors.""

This reverts commit c9432471c287afffa3b098422eb19cc6f5004569.