Disable old compatibility layer