Reorded for clarity, closes #9192692181682