Revert "Merge branch 'fboencapsulate'"

This reverts commit 8673d3688580c63297cdfa42c4a201631d519a42, reversing
changes made to b1395a8fe092e7b046e9b6179cf8224ca03a0313.
fixing compilation error