Added Jeremiah's code that got removed during merge.

Operation committed by @oubiwann, but --author set to @jlowin.