WP-1083. Keep on doing the 'nasty hack'

Jira issue: WP-1083.