Revert to 06d40c19b8705687e5af092ff70db27994618afa