Back out bug 851788, seems to turn stuff red.  Attempting to determine the actual issue now, will repush with the necessary fixes.  Ψ