Backed out changeset 40ecdab580b3 (bug 936995) for potential JB build error