v1.8.2:
Everything is added back now