Revert "Merge branch 'Atlas_3'"

This reverts commit faeb4c8d6e7cda63c51e699b9e4bb73e1b7f1ef5, reversing
changes made to 5be30ae23a3acadb983e4c2da84db13a30c800e1.
Revert "Revert "Merge branch 'Atlas_3'""

This reverts commit 948c327cf6a77abdd1d333517922af1e0f85210d.
Revert 27bd3a6..6bd04e0

This rolls back to commit 27bd3a6d409413da66b256722b2cd2ba6c722e8f.