Remove our own compat in favor of six