am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb

* commit 'f95bd0feb57f1503be7c08083c0a4d22286256e8':
  Argh forget to include my final part of the change.