Revert 6a83eea..223549b

This rolls back to commit 6a83eea3b79c3fe13de86a7c195ddccf0a5393ad.