This reverts commit aa57c2da4b09299f7b8ea348cfe5dda161caad87.