Revert "Merge pull request #21 from ept/SAMZA-152"

This reverts commit 518f89d3f5b019d430d608349c03fc2e59ed1088, reversing
changes made to 79f31224308f0e2e39e5e6851ebb4535611e25f6.