Revert "Updated from master."

This reverts commit bd7430443ba1dc1695b355f4e649e6eb5aad2967.