I epically failed the merge. Here's the fix.