Revert dac4956..2ef88b8

This rolls back to commit dac495619da944480381307151ec5138f3dc1f35.