Revert ae61eec..8672928

This rolls back to commit ae61eec01b01598dca07c913def08043ed7ecb16.
Revert 17b78ca..7bbe4be

This rolls back to commit 17b78cae464cdeee08c90ca3848b5b48b80a0938.