Bug 1072483 - Bustage fix for p2.