This reverts commit 897720fa91. A new version of Compose was released, with a fix for the issue we were encountering.
897720fa91