Reverting to 2d451f, it worked better