Revert a part of 3dfd3fa9b that shouldn't be changed in the first place.