Revert 91e8d8d..c6f1d63

This rolls back to commit 91e8d8df6960c61d6ac2e601ead9fa4644b4fc21.