Build fix from previous revert-revert 72ddba5e88b4c92f7fee3ea1716eb53f18b7b988