Revert some of the recent changes (Theo)