Reverted changes for bug#10145.