Revert "master > one"

Reverts Bowbaq/pierre-merge#1