Revert 7a2bf5c..788f992

This rolls back to commit 7a2bf5c3bd2213d5a794ac973ee95144a6f19c2f.
Revert f7924ac..6c084e5

This rolls back to commit f7924ac37d0122ddfdfe1ecaf0551efbd7b0a575.
Revert 5ed79af..645565f

This rolls back to commit 5ed79af80cbd8740fdebb79fd256efd605ff23cd.