Revert e587181..16bb96c

This rolls back to commit e5871810d3056ee9d89ecd4299ab712858f41b3f.
Revert d0707d6..3f52cc6

This rolls back to commit d0707d6129f87e151d296d203b676a9a1b2b43f4.
Revert ada5946..fd3909d

This rolls back to commit ada5946fc712062b70bab70fc88edb8c366b4461.