Backed out changeset cfb6cd8accc3 (bug 911152)
Backed out changeset 5a520e97e6a5 (bug 911574) under suspicion of causing robocop1-1 orange.