Revert 48b6ee0..5963ffc

This rolls back to commit 48b6ee03c0a3d72941335e32154789e797263b75.