Reverted, will open a PR for master in a bit.