Reverted for this branch to the official master branch