Revert to fb18d5f8665f4e960a1d80d80c946f9cb42dd808