[PR5161]Fixing up issue with broken ui suite.

Reverting changes to PR #5161