Revert 3e5ae26..5deb2f3

This rolls back to commit 3e5ae26032e957f785c246787fd5f946f1f6794e.