Add ability to disable facade swapping