reverted change meant for 1.6.x branch