Revert to 340dcae