d5199cdd7a
This reverts commit 44b29dd7b6.
Should no longer be required as of last patch.
Cc: Eric Engestrom <eric.engestrom@imgtec.com>