Revert "Titles fixes"

This reverts commit 7e305a179cd51972b1f6604958b03802d3a0e4d9.