Rollback
Merge pull request #4 from alera/feature/SOL-232

Rollback