revert (see #465)