Revert "Revert to c31f898b0862c55610ea04f916dd22bbd9360265"

This reverts commit 395a200370c4a76218cea400c593ebb0753a05de.