Revert 7b11a48..2170b9e

This rolls back to commit 7b11a48b752e99109bca0ca0e7b0e9aaa5e22cd8.