Revert f7df09d..84938f6

This rolls back to commit f7df09db1343567505fa13e46fffbc7969ff9c85.
Revert 84938f6..384a7f8

This rolls back to commit 84938f6e86c2e4d3b4d1f1c23432ed2aa00dadbe.