Reverting because previous commit caused os test to hang