... and force the caller to make a decision. In fact some needed to
include empty cells.

Change-Id: I82b6ef72f7ecda6543b3cafc70f475519870b471