We should do something similar as the core did in https://core.trac.wordpress.org/changeset/36550
We should do something similar as the core did in https://core.trac.wordpress.org/changeset/36550