Yes, that's exactly what I proposed in my solution 2. Hopefully for 1.5.1. I mean, 1.5.0 was supposed to be released yesterday...
It should not be that hard, and you are disabling a feature that is in 1.5.0rc1 and rc2.... and you have not changed announcement. Bo