Cleaned up the scars from the merge, and added the working fallback