Revert "Fix from merge errors"

This reverts commit 1f3e963e34248fda87e58b3e795507fa4800ec86.
Revert "Revert "Fix from merge errors""

This reverts commit 1f1e44af35c3a39fd3d0dc5f556a27e17c5912ab.