As mentioned in the previous comments, we might need this back till we have a better solution, as its no point going backwards.