Rollback #1245