revert the temporary hack