I've like to hold off until we have these TODOs addressed. I've raised [bug 963301](https://bugzilla.mozilla.org/show_bug.cgi?id=963301) so we should be able to move forward on this soon.