changed logic of remove back to prior behaviour
Revert "added workaround, not a clean solution but fixes unit test" because it
just isn't a proper solution

This reverts commit 5eeb81219dd39cbbbddb70728d0d551fc22d445f.