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