Partially rollbacks #270