Revert 1140006..3302512

This rolls back to commit 1140006ab7a7bdee79d399514e8aa644bea4db57.