Reinstate 583b9f14ff8e96d737797aefbabd3312a8d98104 [closes #2274]

This reverts commit 76ab0931b74aceb564316c76a63e8c7c36c7d249.