Revert 32fbb20..2990b05

This rolls back to commit 32fbb2007fc8c54ce9704b960f2e61298ec2affc.