CF-147: Split this up for easier step-debugging