This reverts commit d03f943f31e28a8fa479be13c6e8ace20b164e35.