Revert 686f776..f214857

This rolls back to commit 686f7767980db81fdf49955b0bb90d7f65dc0158.
Revert "Revert 686f776..f214857"

This reverts commit 3983290c5ac694c67e9765e3a5f33967d9f3c141.
Revert de680c1..3969dbc

This rolls back to commit de680c1e8c59a9e882eabff67d1991bb52a94ed0.