(cherry picked from commit a33654dc) Just noticed it was removed with the "Compound Update" - a87c2e6a