Revert hackery.