Revert fix