This reverts commit a95a53aadc. i.e. the change is moved from the master branch to staging.
a95a53aadc