Revert to ede0643bb