Bring back NET_45 compatibility after last commit