This reverts commit 9c896492006f65aa9ef9c8612760b6381ab5c3c6.