This reverts commit 17b896e4. This is possibly incorrect approach. Current work which detected this issue will be recoded to workaround it.
