Revert "qa: Minor frontend fixes"

This reverts commit ad579347609ae9cb24e5ccb64687a9615c4cacff.