Reverting some of those enhancements