Revert 3787455..94c257d

This rolls back to commit 3787455202d9ea3f44b4f3bf39f7e3e92883994a.
Revert 94c257d..61a6efa

This rolls back to commit 94c257d6074c58ea980905e1100529156e82bde4.