Workaround for WordPress Core bug # 28403