undo PR 18 math squirrel (in a hackish way. Did not get git revert do it)