Revert daa3f83..6d6e545

This rolls back to commit daa3f837e6ddd5f5156c3f59825afeead5722659.
commit