Revert incorrect fixes