Revert "#1465"

This reverts commit 0fb515d08e96055327fc377aae02ecc1e1b248fc.