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