Revert "Merge branch 'master' into Atlas_2"

This reverts commit 00d2f0a327a2a542ce67f7a039fb37236d880a23, reversing
changes made to d1ad27dd7e026e583c3dc27181a136dd1a3b8722.