Revert f9430bd..4bf53fe

This rolls back to commit f9430bd41ffe09f5a850fd9a71a1411f7ef16309.
Revert 4bf53fe..0ed4bc2

This rolls back to commit 4bf53fed8a4ea18e61356049626adc156166f57e.