backout 4c16d08e358b (Bug 993407) for test bustage. r=bustage