The fact that this was removed leads me to believe that merge 6e5a9e471244047cf6b4fed4ec8767fad961367e was done incorrectly.