This reverts commit 418b3ccbc351e9d60f7ee21fea1bdeb2f66bea3f, reversing changes made to a45afe1cd7810d208fe7a2a98c3a7d9d39bc6335.