This reverts commit 4c09537776.
4c09537776
- only execute certain code when the accompanying command exists