Rollback #1620