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