Backout cset b2bae68e3809 / bug 1055319 due to test failures
Backout cset b2bae68e3809 / bug 1055319 due to test failures