Code

Revert commit 11689 which breaked known behaviour