Refs #547. De-linted to comply with jshint 2.4