Hydro builds will fail with this. It looks like we need a master branch after all which should get occasionally synced with hydro branch dependency updates.