Revert c33d277..78555df

This rolls back to commit c33d2778e8c223ef363e66932117d10fe731ff7d.