Revert "fix build after latest merge"

This reverts commit 763c8afe07b4aef66172af32a3f7c979fa6190d6.