Revert 2ee2e5b..d9a51fd

This rolls back to commit 2ee2e5b787575debbe1facd1c571cd6f27b97393.