Reverted 776e07c..e8155c6 in tubesock, adjusted usage.