Revert to upstream master, after realizing I deleted a method in a PR that wasn't useless.