FS-7463: revert commits c2c04632 b3356313 and 6bf74877b5f0.  Future pull requests should be verified that they compile before submitting.