Update 3
Revert 7699d4d..e1b16ab

This rolls back to commit 7699d4d133f5e97041644e84bc2686c2d56c569d.
Revert e1b16ab..7882d31

This rolls back to commit e1b16abc50d6a397d91cdfe755265e0c2a35a22c.