Backed out changeset 81f210d3ad52 (bug 944451) for device image bustage.