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