Merge "Revert "Revert "Quick compiler: remove temporary workaround."""