Merge "Removed now obsolete compat-code"