Revert "Try a different approach to get doctests working"

This reverts commit 8a5c5de3a4377635ffd18e2737d8dc5ee6c02941.