This reverts commit b5de136e. Based on post commit feedback, I need to some other work before this makes sense.