Missing cleanup from @45cd1c2dea3679c89affa8658cbb9d5ac9174fb4