Backed out changeset 3438d3d04bb0
Debug patch for M8 assertion