backported fix for https://github.com/slick/slick/issues/105