Apparently overnight they ammended the rule to:
* Kickoffs from 35 yard line
* Touchbacks to 20 yard line
* 2-man wedges are acceptable
* Players on kickoff coverage must line up between the 30 and 35 yard line

And it was passed today, according to several sources on Twitter (Schefter, LaCanfora, etc.)