This reverts commit 302d0d36f7 (7e9e96ba01 and bd912b7bed), reversing changes made to fc6992b3fb.
302d0d36f7
7e9e96ba01
bd912b7bed
fc6992b3fb