Revert d1e6605..38ba4bc

This rolls back to commit d1e6605dda6ea17f83690dd9b43a0df43fb2fec8.
Revert 873cae7..99f42e7

This rolls back to commit 873cae79e6e487fddd26a6ddc498573eb2455127.