Revert "Rollback merge"

This reverts commit cdc3a2ac70cf15075cc3f265279d708a41255e2d.