This reverts commit fbcbb286f69daafb4e1135fd3d43be952752449c, reversing changes made to 116b6f6fb4.
116b6f6fb4