massive entity frame rate drop

I have a wheat farm with 2500 wheat plants in it, water flows down an harvests it for me. i never had a problem with it before, but in one of the recent snapshots i harvested it and it lowered it to 3 fps. i would get 27Ish before. i could handle 6000 item entities and it would only drop my frame rate to 5 fps, now this happens from 400 item entities. PLEASE fix before the update, it has made the things I do with TNT more laggy from the entities dropped than the explosions witch dropped them and the project I am working on is no longer possible with the new entity lag. i know it has been around for a number of snappshots but hadn't brought it up as I assumed you were aware of it.