Revert changes done for PLFM-803

Found two previous changes:

1) https://github.com/Sage-Bionetworks/Synapse-Repository-Services/commit/f860b6ed574c5c0b72b353608f0bf6b07c7bf342

2) https://github.com/Sage-Bionetworks/Synapse-Repository-Services/commit/f448bba7d9c6c6accebfd860271ce26082ac0851