Revert "Merge commit 'e53558d5d6172beb49fc92a856aaef66037ba98e' into local"

This reverts commit 739cfc25d2e229f069eaf24cd4f00273cfb78641, reversing
changes made to 7ff202b1c07b6213aad8d64ac2e691b7578b5b4a.
Revert "Merge commit 'e53558d5d6172beb49fc92a856aaef66037ba98e' into local"

This reverts commit 739cfc25d2e229f069eaf24cd4f00273cfb78641, reversing
changes made to e53558d5d6172beb49fc92a856aaef66037ba98e.
Revert "Revert "Merge commit 'e53558d5d6172beb49fc92a856aaef66037ba98e' into local""

This reverts commit 5c932b1c7107a354c7c85df05e22cdf55b0d266b.