Improve performance, short-circuit earlier when disabled

Improve performance, short-circuit earlier when disabled #93