Due to the branch of ES referenced being one that predates the image fix, it is quite difficult to copy and handle the branch, and even harder to try updating it.
There are over sixty conflicts between "patched-editor" and current upstream, and I'm not sure which ones are things necessary for the functioning of the editor, and which ones are not.
An update would be very much appreciated to resolve this.