Tony said that he will do a fork. So, there is no need for me to merge. Also, I asked for a better version not just to disable it.