Merge "Revert "handle surfaces posts independently from composition""