Revert bug fixing on the fade, waiting for first commit to be reviewed