Revert "Merge pull request #29 from pbs/LUN-986"

This reverts commit 967ae17fd445783d2b0169d2a40aa92e5ec59538, reversing
changes made to fdaafe699bd25aa100274facef1437041ee9956f.