Revert last two commits (at Mickey's request)