Revert "Merge pull request #453 into develop"

This reverts commit e4a9ee7c189787e9351260989a3614d92cdb33be, reversing
changes made to 2c17a0599b196ef9cb552ef0aa906fc594c19b60.
Re-merge pull request #453 into develop

Put a proper user on the commit, rather than generic
workstation name from original merge.

This reverts commit 2d141a1a864c78b9ebb5359254d22b8c040d8a34.