Revert temporary fixes.