Rollback of Timing change and release of 2.5.1 (12)