This partially reverts 87d1b5dd99c6 and cc3f0e8968a4 to base the state on the methods instead of the quantity.
Closes #13154 (closed)