rollback 1.3.x specific changes to release 1.2.1