This reverts commit d298017.