Revert 7328b29..793c3ec

This rolls back to commit 7328b29118d53bd8275e85204f2e4bc222435b8e.