Revert 8f6dbe1..8937206

This rolls back to commit 8f6dbe12617f0eb8916322f30a82686004f91725.