reverted removal of optional argument, too handy for tests and it's not really a requirement