This reverts commit 36cefcf0a3. Apparently it was already working correctly and I just wasn't looking properly.
36cefcf0a3