Backed out changesets c6691cff88a4 and 43a7db7bf902 (bug 1044598) for bustage.
CLOSED TREE