Undid commit 08d34cc6790334b60c063872fc0ab87adca87191 and 6bed85aff78264077aba6b358c7b912b35516a3d