Maybe we should keep doing this by default.