Revert r85783, it seems to brake random stuff in random places #fail