- just revert the changes that seem to introduce black screen problems
Merge commit 'bb2ee0f1750dbcbe76a5c74cd73e6281401d6212' into LINUX_3_10

Reported fixing black screens on Mac.