...and calling remove on a list apparently returns None

Change-Id: I7a44d85cfebf17ac89bef0ce2d322a2cfa929899