as long as we're breaking compatibility, may as well fix this