Rollback 929c678.