surfaceflinger: revert part of the previous commit