This reverts commit c888c249cb28b7225cda89e0bb5135e357fe1bf9. Another solution that caused more problems than it solved.