Applying 7b41a76 from Terry-Mao.