I think all of this can be removed but using the the approach [above](https://github.com/yahoo/mojito/pull/1233/files#r6080885).