This reverts commit a53d8d3e61 and 105634435f. Reverted because the change broke some components. Will be added back in a few days.
a53d8d3e61
105634435f