revert gross hackery