should we bite the bullet and make this a configurable option?