Code

Follow-up ui rollback for fixing bug #399604.