This reverts commit 59dfe4eee24630649a1b96b82cb55fb29e07a0b0, reversing changes made to e6fa7d433d497abd0ffa56090eafda4630c96442. This commit does not constitute agreement with the claim of copyright violation made by Adam Armstrong at 59dfe4eee2
59dfe4eee2