Done as part of https://github.com/silverorange/admin/pull/27