This reverts commit ff12d52832, reversing changes made to 92609f3d9b (partially).
ff12d52832
92609f3d9b