Revert "Jamies changes"

This reverts commit e2fca7220eddfaad63334b993e908ea93eb70397.