reverted commit 8eb0aac which breakes disabled options