remove hack for existing buffer instance