Revert change for 11348 until it can be looked at even more.