so change this to "Temp fix for BUKKIT-3846" maybe?

Note to self: put "Partially fixes BUKKIT-3846" in the commit message somewhere