Revert 401bf5b..6882a22

This rolls back to commit 401bf5bb6d1e9d7d484a8fbde1332cb9eb15252c.