Reverted r87961. Broke stuff on action=edit...