Backed out changeset f1660c847ca2 (bug 978235) for landing with random debug code.