Fix merge error.

Merged changes back in: 'Make grid option more generic'.