Rollback to commit a3ceb3f53c2eeaf021b41b3cf83b0f11502259f4 in compliance with BukkitDev requirements.