Somehow my solution got screwed up and I had to make these adjustments to get it back to normal.
JIRA: VIX-216 partial fix, other is in core repository.