B3613 - revert broken fixes #3616 (Revision 0bb99fd1, Revision 77096ca7)

1 job for master in 1 minute and 56 seconds (queued for 1 second)