Turn off direct addressing
Merge pull request #4938 from danmcp/master

Merged by openshift-bot