am c0f9e2c6: am 60764549: Merge "Revert "Revert "Quick compiler: remove temporary workaround."""

* commit 'c0f9e2c6dab9a76ac46d30a9792f34799193d97b':