This reverts commit ed4869452defbc317cca130512b6d67c380fb908, reversing changes made to 175e20ca5cc9540a1fb6be5c1630e5df56015dd6.