Revert a few bits that have been resolved with previous commit