Restore original behaviour that was unintentionally changed by modifications related to #4148. Closes: #4260 Original Pull Request: #4261
Restore original behaviour that was unintentionally changed by modifications related to #4148. Closes: #4260 Original Pull Request: #4261