Rollback the ENG-6037 work on the release-4.0.2.x branch. This compensating
commit was generated by:
 git diff -p HEAD..67fe4be8b3f31121def2554e0ddc29ec28004869 > rollback.patch
 git apply rollback.path