This reverts commit fc12dc32609dd59751c1b2588a008f748c483233, reversing changes made to ff48c9f628.
ff48c9f628