Revert "Revert "Frameworks: Fix build""

This reverts commit 0b6822f7e8cd45d38804113f4bf883cb0e36458b.