> doesn't seem like this change belongs in this PR

Moved into separate PR.