Manual Revert

Copy and pasted changed files from commit e91a15