Revert "Temporary changes"

This reverts commit 36cc86b5f13f3296f51fc4c95a0d108f02139e55.