Revert 2067deb..48d0e2e

This rolls back to commit 2067debbe78a34aee62cd3d552c410aa17af8753.