am 22b33f2e: Fix backwards compatibility issues with compat lib.

* commit '22b33f2e5431b923c96999124bb08e1e536e9381':
  Fix backwards compatibility issues with compat lib.