Temorarily revert two recent commits: 46e74eb and bfb0bd4.

Note that the two changes should be reinstated as soon as we solve
the problem.

Ticket: #6734