Backed out changeset 4c2bc5ae8f95 (bug 945562) for device image bustage.