Revert "Temporary changes for staff release"
This reverts commit fe11eec6861072b30cb1456afd8061a0b32f50f0.