Revert 7caebcd..a65dde4

This rolls back to commit 7caebcd8587b9823d7fbf6e8be1f199a3cca5d1d.
Revert b1790a3..fede9a8

This rolls back to commit b1790a3c284bd14e559eecf51496b95857d405ff.