Revert "Revert "Revert "2:27 changes"""

This reverts commit c1abbb0ce5288a5a16ff4a555028ba962e02d630.