This reverts commit c46c19b518a0da77aeebfbb926a904c5d7f6dc2c.