#326 actually only affects 1.7.x, reverting 7b75d540aa2e49d4a7907711ecd2cd6e2817c746