Reverting changes from 1.4.10