[Issue 9870] New: Remove optional overlay syntax