Fixed revert support for time 1.5*
Merge branch 'maint-2.4.2'