Revert "fix option manager"

This reverts commit 206e2c8cb28a8158b8a0f092646817de3c60184c.