Revert "Temporary changes for staff release"
This reverts commit 31ae98c199840d81bb1f1d3ea3e3137559b8d386.