Backout fd0615bc9ee5 / Bug 814870 due to unit test failures