Revert "Temporary fix for error concern"

This reverts commit e83a79e1b7d6f02732ba1e0dd7dbd88df0ce6ead.