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