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

* commit '607645493171eb84213c8af7efcb1c10480a281b':
  Revert "Revert "Quick compiler: remove temporary workaround.""