Fixes #1783, removing some components