Revert "Fixes to get a build"

This reverts commit a076abf20f5d71768fab01edc45058bf9d8c4ba4.