Revert last commit to prepare for proper cleanup handling.