This reverts commit cc7d7ee23459212567359719d09b36f5a23c7693.