Revert c4f0fac..61c32fb

This rolls back to commit c4f0fac09c03853bae3eb9fd72dac9ddbe98efd3.
Revert 61c32fb..bff63a4

This rolls back to commit 61c32fbbd78e4b496c5ce50f36a2c22d86e9d2dc.
Revert c4f0fac..28d33ef

This rolls back to commit c4f0fac09c03853bae3eb9fd72dac9ddbe98efd3.