Revert SONAR-4515 as current implementation breaks views