Revert 4f2f860..84b410b

This rolls back to commit 4f2f8608b62b7f1cbcde90aa39b249f6a194860d.