reverting default arg change since scala-refactoring doesn't seem to like it