Revert "Merge branch 'master' into Kids-Section"

This reverts commit ad23f854e10bfea04b22abea09d560793eacc0c2, reversing
changes made to a61a195bfe8f96ac4a9d6eb93bef075dc1f993ed.