Revert f6e6523..cd1b786

This rolls back to commit f6e65231d9b444c1af58446e2f9e3ae838732d79.
Revert cd1b786..2db3a61

This rolls back to commit cd1b786a6dee204da7993cd011a09b8bb53116f8.