Revert buggy 304 hack