Scott, I am going to remove this from 5.0 until we see some confirmation that it is actually occurring in that code. The code here is very different between 4.3 and 5.0.