Temporarily revert 855d68d9d852460040dabfc59b4facacd5d1c88f