Revert WIP temporary hack