Revert "Catch up with master"

This reverts commit dc27ed8d6b9b317027ed6e418ea1d42f281aff09.