Revert 1e2a75f..7a69b9b

This rolls back to commit 1e2a75f693b187f29cd47c55c86c7e77baa6bc9f.
Revert 7a69b9b..2985d90

This rolls back to commit 7a69b9b34a970bb2cb66e7601c905fb0bd9f6432.