Revert 68e66dd..a0034f2

This rolls back to commit 68e66dd0037bfe4f85c54d7bb99e0abcfc6bffbe.
Revert a0034f2..5a6c851

This rolls back to commit a0034f2efad97aac134689515bb9cfe0adbeaf92.