am f4f2bd21: Tweak for forward compatibility

* commit 'f4f2bd21d5b57f1598172ddbc44817c10785bdb3':
  Tweak for forward compatibility