Revert "Merge pull request #3 from pbs/LUN-1169". To re-merge this branch use the new unmerged branch, a copy of original one LUN-1169-new

This reverts commit c97d0937687047cb54932b0cf6ad797517e1f40d, reversing
changes made to 0ce626ded5e96622f4706af2fef6cb139a6adc5e.