Revert "#417"

This reverts commit 2bc7f790cd40b23ed394b478d14c323543a4aff8.