Improves 7d7329c61fcbc68613c2d70ddb7e6bf5f85c888c.