1st
2nd
Revert "2nd"

This reverts commit aafd388678ab777f584c7143448855747a8c3d51.
Merge branch 'logan'