bf56215166
This reverts commit d62fa8880e03e8823057a5d4d9659d5f19132806. These options will be reimplemented differently.