Rebuilt for 1.7.9