Revert "Changes due to new build on developer machine"

This reverts commit 43df23df4d80437cd40602f6947826aa6adcc1a7.