Revert "OS-1 0.3.1"

This reverts commit 730817ca97bdc1e61c840ab058351ab0f04c68d3.