Revert "Another attempt to fix build."

This reverts commit caa977d6405ce325af3e2cb14deca3002c5a85ed.