revert possible fix to #928