Revert "Rectify various build errors"

This reverts commit 45e70614d6cce21e3f699fe3c8aab5e3cbfcbf9a.