Revert "more unfloat"

This reverts commit 5b0235ead62ae0af2804c9d84e8802245a9b2d02.
Revert "un-float right"

This reverts commit 9921ea1936040eaa45be683d3975d39fe4e8749c.