Follow-up for fa6f37c043. Partially reverts d5ab23aa54 and 3540ce8587.
fa6f37c043
d5ab23aa54
3540ce8587