Gave up on fixing Waila integration for now.