Revert "Split this conversion to avoid issues."

This reverts commit a07c5f3db4138e4ed04a0a1621dfb00e3dcda151.
Different split to avoid issues.