Revert "Revert to master"

This reverts commit e3997aad69418163141e0362e360ef341d33c700.