This reverts commit 20753fc70547f13b85e248aa07be61785ffba628.