Re-enable viewport code. Let me know what it breaks by posting an issue.