WIP: Try to solve #461 with FrameworkRestrictions