Fix for 69dcec66b0273101f161be33316ae3bcf30a9a2f

Missed a merge marker in the rebase