First attempt at porting to MC 1.6.4