Revert "2:27 changes"

This reverts commit c8a1719f789a29a98c13b8fdf959bfb022d1bdb5.