Revert r52459, which was causing an infinite loop or massive slowdown on MultiSource...