Turns out we do need those props. Partially revert
e6d7ce8d04bb21864978d5a360d059d640b3ab20