Removing a workaround that may not be necessary on 1.8.7.