Revert "dshoig"

This reverts commit c583180865a73a4c49268099fd84846b2d660e1e.