Revert last commit. I fail. This was a stupid idea