This reverts commit a7c2f89982. Been meaning to give proper attribution, but Git lost the commit after I edited the merge commit. See #667.
a7c2f89982