This reverts commit 7652d579f5. Not working on forks, and I don't have time to fix right now
7652d579f5