Revert "Revert "2:27 changes""

This reverts commit 342acff7dc50933c203e218163816fd9565aebad.