Reverted max's changes as it breaks annotations.