Revert "Fix build, log2f conflict"

This reverts commit 750a7c55f3d0764cb1738728870056394520aff1.

Josue and I figured out what the main culprit of this was and have fixed it.

Change-Id: Iedc92d2ab4154946b4335d549fb53929dcf054f0