This reverts commit b662866d6642c9d5e6f5233769869f161097ce50.