Revert "cleanup after cherry-pick"

This reverts commit dba1e718f4e4346f21a523a7d01706cc28a177bb.