Revert an unimportant change that breaks some tests