Re-add support for non-portable socket options