Revert 019dbde..8cf398a

This rolls back to commit 019dbded0337f0585c65278a2994118403cd26d5.