This reverts commit bca565a.