Revert 680cd18