Revert 660f04f..73e1604

This rolls back to commit 660f04fdfb9e6cc779f014d2e782c9a5e0d50fc3.