Revert 2979b02..6f83776

This rolls back to commit 2979b02b6c8192dc1bfc70674da93762210e1dc1.