Fixing the prevention of mapping SU to a facade
Revert "facade mapping fixed"

This reverts commit d1acfe51294ca2243d770aae81c77ecd0b134e24.
Merge branch 'master' into develop