Revert "Change to Extract - Will Revert"

This reverts commit ac17fcc56335513ba54fc61170bf9e35abc1c7ce.