Revert timeout and use mixin