Reverting this changes as I am not using modified version of this method.