revert off canvas stuff, push to 5.3