Revert "Fix #1472"

This reverts commit 73349efeec2930a94d753812d779cc2ce304192d.