Back out 2af3c33bfb29 (bug 828088) for metro-chrome bustage