Revert 7d7c6df..7e63b60

This rolls back to commit 7d7c6dff7984ae5390afeb9dd11d9b9ea1030816.