if this works as expected, I think I'll toggle it to default-on with the merge.