Revert c0a58e1..4e9ab85

This rolls back to commit c0a58e1dda1118e842823dd2b39e614e1e05e0bc.