Reverted mocha removal