Revert "Revert b09c111..a6237e7"

This reverts commit 0b01275dfe74c644431787b433d11dbdeab641c7.
Re-apply team1 changes from 0b01275.