Yes, that is what I propose. Those changes in build.gradle will need to be removed, as well as a slight change to not activate the shell converter (that should not make the build fail though).

What errors were you having?