Removed unneeded code after fix to ERRAI-561