Actually do it correctly. Should be more forge friendly now.
Merge pull request #306 from MinecraftForge/1.6.4

Actually do it correctly. Should be more forge friendly now.