Revert 9346c86..57ddf42

This rolls back to commit 9346c862669e77a6e1aed4853b87efef70a325db.