Remov workaround 8763
Merge pull request #1127 from monarchdodra/8763

Remove workaround 8763