Revert "Merge branch 'Staging'"

This reverts commit e334521a7c1c48e0f871aa834c59e6ac3ac0d2df, reversing
changes made to 7544c20423589d9a03c3ef24021a38c94985f8a9.