reverted possible fix to #928