revert, add comment about possible future change