Per our earlier discussion, let's just yank this for now. If/when issues are filed for this we can re-add it, but let's keep it simple where possible.