Revert c58c808..68814dc

This rolls back to commit c58c80890d93a0252fd95a92eb770b6d4c0a5c65.