This reverts commit be94ec4d2c1d5e3de08e50a0733bd53c69d1acd8, reversing changes made to 2d9e02db0e580eaf9ccb6a6d2176ee16107a4b0a.