This reverts commit f7d2c36086ca01f54ec95c55a744f96e665ac5a7, reversing changes made to 60bb775109578bf05e9689c8452d7b4afaa33347.