Revert "Fix omission in previous commit"

This reverts commit ea7cbcbf0a2affb2d3981af11bbd0a326562b426.
Revert "Revert "Fix omission in previous commit""

This reverts commit 58a8cec8b4269403cfe64fbbd8d4ed3f0a8e0866.