Revert crappy optimization.