Merge "Partial revert of 2fabea7eea556aba6eda9b3385d9844123328482"