Revert 322d31c..cee31ac

This rolls back to commit 322d31cb63b15e8092c07c1c6d607d11d78eb9aa.
新增问题和选项