Revert 423311a..7326316

This rolls back to commit 423311a1913310f785028773edef0a30b5f4335f.