Remove ContentHandler too. Copy paste from core

Change-Id: Ifda5d943e23d704bcf0eb7514d29e6ff7cdd0c9e