Revert "Merge branch 'origin/os-tdd'"

This reverts commit 7f8cbf55f66a5da64412a7dc8f74c62cba4093b2, reversing
changes made to 89e54e86a433546e7ca7d514a7c9dbbca27fa8b4.