Put back into URL namespace, use feature detection

Add a global flag check for testing.