Reverting bug introduced in 563ef635ee22a35560675ba22a6bdf88079a4ad2