Reverted your "fixes" that actually breaks everything