Revert "SYNR-580"

This reverts commit 32881339aedcdbf38e022100316b2f9e0c938a97.

reverting pull request for SYNR-580
Merge pull request #111 from brucehoff/SYNR-580

REVERT SYNR-580 PR