Revert a265e8a..61c8702

This rolls back to commit a265e8a1dc4c9b9dcabf8e445792961de9d9a9d0.
Revert a90e4d9..a8aba67

This rolls back to commit a90e4d916a307f8ab163e70a315878897f2e6a5d.