Fixes #6092 - aliasing systems to content hosts