This reverts commit e6fa7d433d, reversing changes made to e2280aa603. This commit does not constitute agreement with the claim of copyright violation made by Adam Armstrong at e6fa7d433d
e6fa7d433d
e2280aa603