Revert d17fa39..8ccda5f

This rolls back to commit d17fa39294c06b81e3dce1c1b9c25a9b2ccd33fa.