This reverts commit a04a2a1f9321356cad8aee402a94bd4f40b1f13c.