I agree. The best idea would be to revert it. Especially for 2.5