Revert 15c5d55

This will be added in v2 instead.