Reverted some wrongly merged changes