Use recently added API to speed up the rendering.
This will create a new commit in order to revert the existing changes.