Revert "Whoops"

This reverts commit d6d527174e022de8e14ff09cf0053efe37f3edab, reversing
changes made to dc26f47064c1394db843870e34407404943fd626.
Revert f8305f2..a21c9ff

This rolls back to commit f8305f21e1ad646b7b4b176746d552355556c7ea.
Cleaned up warnings