Revert "OS-1 0.3.1"

This reverts commit 0ddf724bfd371f61b68fb194711c002969a62843.