Final revert

Issue with using previous versions fixed. Should be the last revert.