Revert 6aa17c2..24756fd

This rolls back to commit 6aa17c2b2f60099b4ee35fcd61c32ac6a912c46b.
Revert cbd008f..b636014

This rolls back to commit cbd008f356f569fe8139c2ba705877b292dcfd5f.