Reverting changes which were not in 2.0.1