Fix drop suffix bug introduced in 5c800212cab987b533276fcc9c09189e5866469.