Switch to the new-old way of using Props