Revert to 266583401f03ac02354052a3247c16ada437803c