Revert 534d6ee..980dcb2

This rolls back to commit 534d6ee940be6ca07894e5a4e6accbd819d2e03c.