this seems to cause some problems with a number of components
This reverts commit f9496177a4c942f2acc39a978a3cd65689f14d8d.