This reverts commit a42441f4275a8a984b8cbe9843883a9299ec6985, reversing changes made to aac996d67191b3062d90e677336ae759cacea07c.