Fix up #3279