DROP column fails as set_default is called in a place where resetting
the buffer is enough. Fix is to only reset the buffers as expected.

Change-Id: Ib5358663fb3f49a44b7f4e69bba79d5690c4135d