PLATFORM-2133
This reverts merge request !57 (merged)
approved this merge request
merged
mentioned in commit 98276597