Revert "2.0.9 part3"

This reverts commit 074fe2ba92ebc04ab612a15f71d5b59f650944f4.
Revert "2.0.9 part2"

This reverts commit ef09bdec7869128122d45d8c3baf6a780928548d.
Revert "2.0.9"

This reverts commit b796432285d8bc35ac88b7d95eef782b0c398b00.