Merge pull request #111 from brucehoff/SYNR-580

REVERT SYNR-580 PR