re-enable 1.3.6 feature(s)