Revert "Pass the Floating all around...."

This reverts commit d465442d08b8546b8fee376719506f2bcc4e8f44.