Revert f235acc..0c01621

This rolls back to commit f235acce502786fac271130475c5d5abb9810c49.
Revert 0c01621..d24ea59

This rolls back to commit 0c0162121108c299761a7ba373f4cabec13e0ac1.
Revert 739a087..2369295

This rolls back to commit 739a0871491a337ed573fd1b685ff46908715c84.