Fix some weird merge stuff.  Restore original functionality