Revert to dd77d81974fff42238ebb20bca4fd07b95c015b3