VOV-1921

This is actually a bug fix for another problem that was discovered in the process of working on VOV-1807. See VOV-1921 for details on the issue.