Revert 3227ead..3ee3bfa

This rolls back to commit 3227eadfc15d571002b18bce053a1bbaf640dc9e.