Revert "Change dropping code to be in line with new forge standard"

This reverts commit 06f55f60bf3056c8c36a44da3dd0043e86331ba3.
Looks like that was 1.7.10 only