backout ef35a8971e08, because of buggy test
Bug 919340 - Test. r=mikedeboer