Revert changes for a simplier solution.