Rollback to old option system, to prevent breaking current implementations. May be reimplemented later