Reverse part of commit 393e398f579cd1251c4ee304f9ca9359db704170