Partially reverted commit 23c05cf7.