Rollback 26

Closes #34