Fix ghost facades from pre-6.0.x worlds

Essentially same as #1905, but for 6.1.x branch.