Revert part of 0ff214f27d that was committed accidentally