Revert previous change while we figure out if it was correct.