Revert invalid refactor