Please add a comment in the code about why this is necessary, and the difference in behavior from 1.8.7 to 1.9.3