This reverts commit 5400511d8616964ddf2c78bb65e72dfc23fa3a25, reversing changes made to 2e15e645e687bc0ad4a210963de0bfadc56d48fc.