revert horrible hack
did something here...