Revert 13cb513..31e76e9

This rolls back to commit 13cb5138f3b2a4ca5cf106daefd6fe9a81569783.