Revert 039f610..7176cc4

This rolls back to commit 039f6105775fd6c118ddaa7a03fe90add89fb208.
Revert 40a4a1b..01c429f

This rolls back to commit 40a4a1b2549bd1c836254340038451762672609d.
Revert 16649eb..ca446bd

This rolls back to commit 16649ebbfb5b660defba675a050353c553c1b0c5.