@KunmyonChoi shared his solution with me on HipChat and I am testing it now.