Revert to 34f7aabf77