Revert c40ab8b..a8856d1

This rolls back to commit c40ab8bac0324b72dc7247448a31dadc7d4dd0fb.