Revert 3016a8a..cbcd8f1

This rolls back to commit 3016a8a31d777a9478e94623dacd5f6c307bd737.