Revert "Fix Router Advertisement/Solicitation option parsing"

This reverts commit f5877367522aad0b27d138e4a56d01be3bd33f2d.