Going back to 4.7.0 for now since performance in 5.1.1 was crappy.