Revert dbe4de2..fa076ea

This rolls back to commit dbe4de20d83df362624aec17c503ee7be83ac0be.