Backed out changeset 5abed7bd3cb7 (bug 838014)
Backed out changeset b5ec7ce219b2 (bug 838014)
Backed out changeset ced35810adb2 (bug 838014). Again.