Reverting commits to prepare jquery-ui integration