Something changed in Wing, and this code causes problems.  Remove it, and plan for the full tenant refactoring later.