Revert 2285a58..992b979

This rolls back to commit 2285a58acb78624cf770feeabbc429ba9ddb90e8.