Fix build failure by reverting no longer needed commit
NO_DOC=revert NO_TEST=revert NO_CHANGELOG=revert