stay 5.3-compatible
Merge pull request #2216 from greg0ire/choose_route_builder_wisely

stay 5.3-compatible