Revert "Merge remote-tracking branch 'github/3.15/fbcondecor' into 3.15/master"

This reverts commit b8521bf10714f59b379c37a1743f6048473839da, reversing
changes made to 9446718c5b62b2d2c697c3d9df8e5a8da5cb5975.