Revert "Manual merge of #1069"

This reverts commit 5d17dd6511f1c21d431148c49771a90c60c2ef23.