Revert 0c0f91b..1e871dc

This rolls back to commit 0c0f91bf44a1038c14a9521b06c4612c32398636.