Fix build breakage
automerge: a7c24b4

* commit 'a7c24b439e54706566a6eba673d49152b18c654f':
  Fix build breakage