fix yet another post-merge build issue