Restored after grid nonsense