Enable calibration code

Unsure this is desired and thus have marked with FIXME