LPS-40378 - Restores 15aced27cdb3f0ca1c806baf8d275d2aa9257cdb