Un-reverts PR #3118
@as
that's all this commit does. further commits will fix cli flags and such. see #2221