OPAL-2067: Reverting to previous version of drop()
Merge pull request #53 from emorency/master

OPAL-2067: Reverting to previous version of drop()