This reverts commit 76a4fd630e954a6b99a964df0ab07d2e48d41b65, reversing changes made to f02cdee36ba28d4785c5ced8a147af6c7264d7d3.