Call .remove() from the right object

This is a regression from commit 130a42cc.

Change-Id: I46e9f70942fe091d5a9cac5c36539a63cacd1505