Revert 46a61e5..ff2b23b

This rolls back to commit 46a61e55652d2d1ab06fa0d485a5d28036f051fe.
Revert 2daaa1b..b5a8ec7

This rolls back to commit 2daaa1bcb6ed755b6c5c7bef928f3203aa59abce.