fix build, undo-ing last pull request