am d48ba867: am e77f9914: Merge "Whoops, need to put this check back." into honeycomb

* commit 'd48ba867d69159542cf967d5fcaba41c5474f134':
  Whoops, need to put this check back.