I'm running into potentially the same thing with some custom cells we have that may or may not be related