Updated from commit 5b55fa45006264a99b8e1eb026e728f377d82b9b.