A partial revert for commit '7b0c6c1'.
This change reverts the code that uses the compose_ method because it does not fix a rendering issue on Safari.