This reverts commit c72020c45db2a24c1113787542f33ef7dce1d2f4.