Revert "#530"

This reverts commit bb7ba593798f38203fbfeed716a179fff4c3d8ec.