Switch back to using ibuffer, at least for now