Merge after backout of changeset 017ec8d2e32f