Cleaned up the mess I made trying to merge the last time...