One more attempt at getting 1.9.2 compilation working