refs #311 - revert merge from master. Need to investigate