This reverts commit f550c317817af85c34ede70ca1e25d677e7b01d7, reversing changes made to 9a230934b5.
9a230934b5