Related and something I need to pick back up: https://core.trac.wordpress.org/ticket/37199