Backed out chane to OPNF to trim never-legal inptu props, which broke Sheep&Wolf (needs future investigation to find the right way to do this)