Revert 3060a7d..48d573c

This rolls back to commit 3060a7d935d69b7aa5f1b6872475f341534b7f50.