Reverted all of the workarounds. Made it work the right way.