Revert d1b5693..47dfb83

This rolls back to commit d1b56938679feffe1b2d03819b9922e41a0913f7.
Revert 47dfb83..4d6e6eb

This rolls back to commit 47dfb83bca1c3e2f5aceb1475ce2cf9d11b8ca53.
Revert 4d6e6eb..3065072

This rolls back to commit 4d6e6ebe51373911c4fe5e1c9a4014df984c31d3.
Merge branch 'old'
Revert 47dfb83..1c76c59

This rolls back to commit 47dfb83bca1c3e2f5aceb1475ce2cf9d11b8ca53.