BUG-16608 - Undo changes from BUG-16317 and apply FALCON-390