Changelog:
* Removed bug "BUKKIT-4004" fix (no longer required).
* Improved auto mode.