This undoes my fix for the corporate sofas specifically. Their object subtyping is awful, but there is enough redundant code in there to make the layers work correctly for them anyway.