Back out ca56f76237df (bug 922934) because of metro-chrome test failures