Revert 224a1e8..8966b27

This rolls back to commit 224a1e832e4c46f9bd8d58214f78c36f8dd39c21.