Revert part of the previous change