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