When I backported the e0a15c11 revert I forgot to check it was reverting properly for the changes that 9a81a976 had made