Reverted Gemmas awful commit