This reverts commit 15d3d68a5ea819dd82784a9a44cfe26ed5eb74cd. The PR is moved from master to staging.