Merge "Revert "Temporary fix for QXDM crashes."" into nyc-dev