Also remove it in once case when it is not needed.

Signed-off-by: Paul B Mahol <onemda@gmail.com>