Quirk for on demand restricting of system components

Fixes #1859