Revert "Fix 1472"

This reverts commit 078dea83bb084234cd1f6a5e3a97616614635640.