This partially reverts commit ae451894.