Device properties framework fix for 5.6-rc5 Revert a problematic commit from the 5.3 development cycle (Brendan Higgins).
