Falling back to version committed by @ritashugisha in 0f743ae8ccbcc170498cbb0c25f3438e728666ff because I think I broke it.