revert merge

We don't want to mix interfaces (promises/cb) inside of waterline
fix tests
clearly define what's happening