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

This reverts commit ecb91fa5f765ef0e768c7a65c70c97ea2528ab4e.

Change-Id: I273ad791b6160a9396ef6f7972f9336e2903e801