TEMP removing JAI listener. DON'T MERGE THAT IN THE FINAL PULL REQUEST